Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:08:30 +0000 (23:08 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Nov 2011 06:08:30 +0000 (23:08 -0700)
commit057a1722adf98c2ce784bac683abf2fba9db9c2e
treead6711d723bd6bfb00c97d640dd1c339c9fad2f7
parent07eccbdfacc1052fb408c74c845a8c04a18c6200
parentac422813ea1b7099c2022fc81bd4ea5a0d8b01a9
Merge from trunk.